New function necessary to make GtkComboBox accessible. (#132847, Padraig

2004-07-27  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcombobox.h:
	* gtk/gtkcombobox.c (gtk_combo_box_get_popup_accessible): New
	function necessary to make GtkComboBox accessible.  (#132847,
	Padraig O'Briain)

diff --git a/ChangeLog b/ChangeLog
index e29496dca14c80ef11e2b1bbbb63d0adf928b2ec..e10f28261a9dc0840eacff340f0f1a1dfb694dc9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-27  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.h: 
+       * gtk/gtkcombobox.c (gtk_combo_box_get_popup_accessible): New 
+       function necessary to make GtkComboBox accessible.  (#132847, 
+       Padraig O'Briain)
+
 Tue Jul 27 02:34:06 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkwidget.c (gtk_widget_dispose): Hide parentless

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e29496dca14c80ef11e2b1bbbb63d0adf928b2ec..e10f28261a9dc0840eacff340f0f1a1dfb694dc9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2004-07-27  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.h: 
+       * gtk/gtkcombobox.c (gtk_combo_box_get_popup_accessible): New 
+       function necessary to make GtkComboBox accessible.  (#132847, 
+       Padraig O'Briain)
+
 Tue Jul 27 02:34:06 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkwidget.c (gtk_widget_dispose): Hide parentless

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e29496dca14c80ef11e2b1bbbb63d0adf928b2ec..e10f28261a9dc0840eacff340f0f1a1dfb694dc9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2004-07-27  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.h: 
+       * gtk/gtkcombobox.c (gtk_combo_box_get_popup_accessible): New 
+       function necessary to make GtkComboBox accessible.  (#132847, 
+       Padraig O'Briain)
+
 Tue Jul 27 02:34:06 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkwidget.c (gtk_widget_dispose): Hide parentless

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e29496dca14c80ef11e2b1bbbb63d0adf928b2ec..e10f28261a9dc0840eacff340f0f1a1dfb694dc9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2004-07-27  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.h: 
+       * gtk/gtkcombobox.c (gtk_combo_box_get_popup_accessible): New 
+       function necessary to make GtkComboBox accessible.  (#132847, 
+       Padraig O'Briain)
+
 Tue Jul 27 02:34:06 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkwidget.c (gtk_widget_dispose): Hide parentless

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 1618eda0fcf800861357c7301770cddb6811252c..16f5f7bb2c1848870df1234843563c964e36f070 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -3065,9 +3065,7 @@ gtk_combo_box_list_auto_scroll (GtkComboBox *combo_box,
 static gboolean
 gtk_combo_box_list_scroll_timeout (GtkComboBox *combo_box)
 {
-  gboolean result;
   gint x, y;
-  GtkWidget *tv;
 
   GDK_THREADS_ENTER ();
 
@@ -4411,3 +4409,30 @@ _gtk_combo_box_editing_canceled (GtkComboBox *combo_box)
 
   return combo_box->priv->editing_canceled;
 }
+
+/**
+ * gtk_combo_box_get_popup_acceSsible:
+ * @combo_box: a #GtkComboBox
+ * 
+ * Gets the accessible object corresponding to the combo box's popup.
+ *
+ * This function is mostly intended for use by accessibility technologies;
+ * applications should have little use for it.
+ *
+ * Since: 2.6
+ **/
+AtkObject*
+gtk_combo_box_get_popup_accessible (GtkComboBox *combo_box)
+{
+  AtkObject *atk_obj;
+
+  g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), NULL);
+
+  if (combo_box->priv->popup_widget)
+    {
+      atk_obj = gtk_widget_get_accessible (combo_box->priv->popup_widget);
+      return atk_obj;
+    }
+
+  return NULL;
+}

diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index 71e82fbba9ccaf2eea369992497684b2e14ace15..bdbd38b80dffaec908117a07790cd8873ec01cb1 100644 (file)
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -114,6 +114,7 @@ gchar        *gtk_combo_box_get_active_text  (GtkComboBox     *combo_box);
 /* programmatic control */
 void          gtk_combo_box_popup            (GtkComboBox     *combo_box);
 void          gtk_combo_box_popdown          (GtkComboBox     *combo_box);
+AtkObject*    gtk_combo_box_get_popup_accessible (GtkComboBox *combo_box);
 
 /* private */
 gboolean     _gtk_combo_box_editing_canceled (GtkComboBox     *combo_box);